added fade-in and new type