New version with signals