Simplifying my life v2