Added feature and fixed style