/*  Moved to SMART Override *?