Changed the Design a Little