Initial work for pulse and rebuilding