More prev works changes