Moved more towards the more hard coded variant.