fixing that error, reorganizing