Still counting the minutes... onto a bit stronger solution