Dan's changes

Just added commits