some changes to header and controllers