Added needed changes