Update: single responsibility is more important than it working