removed structure, using basic variables now