Make it working, part 2