added some more subs