added new files and fixed error