Some changes Aniq and I made over skype