Feature/onepercent bug buster