Add some changes, add skeleton for another methods