updated to tested version