Update from Candra's development app.t