Updated to simplified use