updated to reflect construction status
removed conflicts with master