added new stuff for adam