still adding logic