Logic Improvements