added function calls.. finally