cvs saving + some logic repaired