Adaptetd to 4.1 protocol