Added newer versions, fixed code