Completed

More work for EvSoft