Some changes, not happy though, I want my own approach after all.