updated files from ap's current working files