added new file. fixed bugs