started working on supporting standalone functions