Merged work from the johannes vectorsson