Back to the beginning, to get rid of this ugly code