Very nice idea to kill hardcoding this!