starting to polish base feature