get rid of the code from the old desing