Upgraded Wicket