Reverted most stuff