Improved drawbridge logic