removed button and shorten stuff