added brett better handling signal