Make it more dynamic