JLP -> final version with android rest compability