updated with new mothods