Interface update
Working version