Aqeel's changes

Hopefully this will work better coming from my computer.