Bug check in progress. Refractoring. Function moved up the hierarchy
Bug check in progress. Refractoring.