Minor updates --> might have more updates later!