Adjusted declarations. Prepared for saving