Updated and added basics