Small changes regarding the hammer stack (not working atm)