Added 5.6
Replace self with static