added ayo's code, no draw