Implemented @s1monw feedback points