Changes discussed over email

Please check the code I might missing something... If you have any problem contact me over email

BR,
Thanos