[FEATURE] Only maps

Little update to end it