added @Null stuff