System simplification
Updated logic