this is about make base safer etc (fixed)