Did a bit more work >.>