added some subs