updated base...take a look