Updates in javelin