Added sna null stuff