restructuring
fixed setup