restructuring less-part a bit more logic..