Reverted shit that shouldn't have been changed