working version 1.3
before rafi update