finished redesign, need to check