more fine tuning. added placeholders where needed