make this to have the proper design