cleaning up previous attempt at design