moved files around
removed duplicate function