some improvements and best in place