removed some warnings, we call it a day!