Updates for effeciency