am going to try some deep changes to code