Try to make it less easy, but still easier than before