providing fix for edge case
removing dev code & chaining vars