Changed and added functionailty