Added some adjustments