Create new routine fixed to work with new tables

nbguzman/Project-LimitBreaker#1
#99 
fixed and much more easier to code now