fixing alignment issue and get rid of surfcamp