Fixed elliotts mistakes