Few tweeks on the interface