Updated to existing functions