updated for gaya