newer design!! just apply all the changes from this design to the others