fixes and placeholder
added tracking