make signal setup little bit nicer?