Some improvements
More improvements