Working as intended now