Removed genius again, moved to lib