updated for luap