commit 11 New light improvements
commit 12 implementation of a new class with new set of rules