updated by faiz