Added some more from javelin