changed Michael's files to work with convention