Started editing for final soda version