working version before deploy