Uppdated mockupp