added weapon stuff