Major changes towards functionality