Fixed Steven's Issues