Added API code + new design