updated files to work with newer layout