Logical enhancements

Still not working.