Completely updated for Nearnia