Made more reliable - 0.55