Made it more flexibel