Update: add delay for android