Even more POM tweaking... I think I got it right this time ;)