improve subsystem definition, improve logic, tide up things