Version 3 - only one bug left