Made make run a bit more dynamic