Simplified code for nono a bit.