rework for farata hw1