Making it more dynamic