More enchancing of basics