Supporting functional steps+bugfix
Supporting functional steps+bugfix
fix reminder