updated for all