added some signals
merge fix