Javascripted a bit more