added attrs, aesthetic chagens