Version 2.3 - fixed bugs