refactored actor to funcitonal object creation model
fixing merge