adding things in correct places yo