updated with alex choice