Stub 2.1.3 b added and 2.1.3 a polished