Changed few things related to synthesize