aa
fixed merge issues
working version