Fixed Atte's Part