hmm that might be an idea to simplify the code indeed.