Made things a bit more dynamic, removed column