Redsign to be more simple