Before Aooly new logic