undate and fix initialization