Attempting to fix some error up in here