Slightly better design