Some additional + initial changes...