Made more things more smooth