Re-added the changes done by Idrrp

Sorry for it again.