Changes for real world