Added temp spagetti code