Added back removed parts from previous commits
Added back removed parts from previous commits