preparing to combine me and leon's code