Added P041, P056, P074 and modified code