updated for future ease