Removing two requirements (yay!)