Minor changes
Recoded and wrote new application